Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Mar 2011 00:24:09 +0000 (17:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Mar 2011 00:24:09 +0000 (17:24 -0700)
commit7b9f7224850c368c5632ebb668dc37d0eeb6fe58
treef8e6494b3dae58b7a5433f8b6ed3a8e46f42a5a8
parent2f9b57b9435540915748fd5a34849a8b5927bd96
parent570329f161e72b5b122dfdfac8a57b02053766eb
Merge from mainline.
src/ChangeLog